[ES|QL] RERANK command - Updating the syntax and behavior #129488
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
💚 CLA has been signed |
afoucret
force-pushed
the
rerank-refactoring
branch
3 times, most recently
from
4aec0dc to
cc96232
Compare
afoucret
force-pushed
the
rerank-refactoring
branch
from
cc96232 to
1fdb090
Compare
…rerank-refactoring
- Not sorting the data anymore - Output the score in the specified column - Applied additional logical plan optimizations since the plan is now a generating plan (because we removed the SORT clause) - Updated tests
afoucret
force-pushed
the
rerank-refactoring
branch
from
f503e74 to
d388ff8
Compare
…rerank-refactoring
…rerank-refactoring
…rerank-refactoring
afoucret
added
>non-issue
auto-backport
afoucret
requested review from
ChrisHegarty,
carlosdelest,
ioanatia,
kderusso,
svilen-mihaylov-elastic and
tteofili
elasticsearchmachine
added
the
Team:Analytics
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
ioanatia
reviewed
Jun 17, 2025
x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java
Outdated
Show resolved
Hide resolved
x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java
Outdated
Show resolved
Hide resolved
x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java
Outdated
Show resolved
Hide resolved
...main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PushDownAndCombineLimits.java
Show resolved
Hide resolved
x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java
Outdated
Show resolved
Hide resolved
...ck/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/LocalExecutionPlanner.java
Show resolved
Hide resolved
...ck/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/LocalExecutionPlanner.java
Show resolved
Hide resolved
…rerank-refactoring
…rerank-refactoring
afoucret
force-pushed
the
rerank-refactoring
branch
from
72ff951 to
d86d16b
Compare
ioanatia
reviewed
Jun 18, 2025
...ck/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/inference/Rerank.java
Show resolved
Hide resolved
| } | ||
|
|
||
| return refs.build(); | ||
| return Rerank.computeReferences(rerankFields); |
There was a problem hiding this comment.
I think we need to add the scoreAttribute here as well the way we had it before.
I am just looking at what we do in the Analyzer when we resolve the score attribute.
If the child plan has the score attribute, we reuse it.
There was a problem hiding this comment.
It is not really needed to consider the target field as a reference, no matter if it exists before or not.
Indeed it is not really a reference because its value is never used / read by the plan.
Eval, Grok and other Generating plans are doing exactly the same and are not putting output fields in references.
Hope it makes sense.
…rerank-refactoring
ioanatia
approved these changes
Jun 19, 2025
💔 Backport failed
You can use sqren/backport to manually backport by running |
💚 All backports created successfully
Questions ?Please refer to the Backport tool documentation |
afoucret
added a commit
to afoucret/elasticsearch
that referenced
this pull request
Jun 19, 2025
…9488) (cherry picked from commit 34ccaba) # Conflicts: # x-pack/plugin/esql/qa/testFixtures/src/main/resources/rerank.csv-spec # x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4 # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PushDownAndCombineFilters.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserBaseListener.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserBaseVisitor.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserListener.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserVisitor.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/inference/Rerank.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/LocalExecutionPlanner.java # x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java
afoucret
added a commit
that referenced
this pull request
Jun 20, 2025
kderusso
pushed a commit
to kderusso/elasticsearch
that referenced
this pull request
Jun 23, 2025
mridula-s109
pushed a commit
to mridula-s109/elasticsearch
that referenced
this pull request
Jun 25, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
RERANKwill only compute scores for the provided rows. We let the user append aSORTcommand explicitly if he want the rows to be sortedRERANK<query_text>: The query<field>: Text field use as input for the rerank modelONis consistent with other command syntax (LOOKUP JOINandENRICHare using it to specify a field to join/enrich on)_scorecolumn (overriding it if it already exists).rerank-v1-elastic)Additional notes:
RERANKdoes not sort the documents anymore. This give us the ability to add all the optimizers rules that were added on theCOMPLETIONcommand toRERANKtoo (such inPushDownAndCombineLimits)Rerank command main issue: #124337